auto merge of #688 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 9 Oct 2014 17:02:17 +0000 (17:02 +0000)
committerbors <bors@rust-lang.org>
Thu, 9 Oct 2014 17:02:17 +0000 (17:02 +0000)

Trivial merge